auto merge of #865 : alexcrichton/cargo/no-more-name, r=brson

With #843 and #839 coming around the bend soon, the original decision for
`--name` everywhere isn't making as much sense, for consistence this is renaming
these flags back to `--<target-name>` for the respective targets.

diff --cc src/bin/bench.rs
Simple merge

diff --cc src/bin/run.rs
index 72e118537654e5244103e08b4d25d287b6e3d5db,6f0cb49d02b699cb1e9d3b1aec5ecbc620e7ad9e..e64eef399b6997aeac8311982e303cc0aaf9ca46
--- 1/src/bin/run.rs
--- 2/src/bin/run.rs
+++ b/src/bin/run.rs
@@@ -67,10 -67,9 +67,10 @@@ pub fn execute(options: Options, shell
          features: options.flag_features.as_slice(),
          no_default_features: options.flag_no_default_features,
          spec: None,
 +        lib_only: false
      };
  
-     let (target_kind, name) = match (options.flag_name, options.flag_example) {
+     let (target_kind, name) = match (options.flag_bin, options.flag_example) {
          (Some(bin), None) => (BinTarget, Some(bin)),
          (None, Some(example)) => (ExampleTarget, Some(example)),
          (None, None) => (BinTarget, None),

diff --cc src/bin/test.rs
Simple merge